bitkeeper revision 1.1236.1.194 (424db315wN-6WLb5nifJ_SZs9-2r6A)
authorxen-ia64.adm@bkbits.net <xen-ia64.adm@bkbits.net>
Fri, 1 Apr 2005 20:46:13 +0000 (20:46 +0000)
committerxen-ia64.adm@bkbits.net <xen-ia64.adm@bkbits.net>
Fri, 1 Apr 2005 20:46:13 +0000 (20:46 +0000)
Merge bk://xen.bkbits.net/xeno-unstable.bk
into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk

1  2 
xen/include/asm-ia64/config.h

Simple merge